Creating this PR into your own master so I can properly review it