Version 2

All basic functionality seems to work