Completed Initial Coding. Going to start re-factoring now