Cleaned up code, got rid of many todos and warnings to get it ready for MVP!!!!!!!!!!