#41
closes #42
Committing for backup
Closes #41
#41 Made everything compile. ready for testing