WIP Commit

Known issues Issue #11