Base, incomplete functionality. Commited to sync for further work.