basic types working, not thorougly tested
Adding test