Fully functional now, just working on styling and navigaton