#41 Made everything compile. ready for testing