Made changes to make it more barebone and ready for design.