I'm probably going to do something similar to both of these things, I don't know if they'll be in the next update though.
