stupid ass worked off master
resolved conflicts from feature/awesome