First attempt at committing changes

Incomplete, need to resolve issues