Ready for more epic merging
Merged remote nicefy with local copy