Working version

This the first working beta version.