Cleaned up some code. Moved to less. Made progress on design.