development: Final dev prototype before cleanup and merge to master