Restructured to make a the layout a bit more standard