Added first real content and corresponding Junit tests, nothing really
useful ATM though