Prettified and started some basic structure