Unfinished

Commiting to work on later