Completed basic structure - made some changes