Refactor
Well bugger