Under Construction

Cleaning things up a little, BRB..