Updated Code

Basic changes made. Feel free to review.

Implementation of the discussed areas in the last meeting still need to be done. Expected to be up either tomorrow or Sunday.