WIP
WIP2
Fixed conflicts in merge