Added in Challenges 1-3, Minor Fixes

Trying to clean up the code a little. Will have to try and integrate with angular later.