Cleaned up the code and fully up to date

Does not include the needed backend code