Manually comitting my things from Task-729 branch. There were merge conflicts and I'd rather do it this way just for now