BETA 1

Code ready for testing, documentation still missing