Work in Progress

Continued development towards the first fully-fledged version