Merge forked repo

Merge for now.. Greater things are still to be done.