Some unfinished stuff
Finished merging