Total refactor. Sorry :stuck_out_tongue_closed_eyes: