committing so that alex can grab the project
Removed errors that were everywhere after taking Neal and Alex's code and putting it together.