Wee first commit so much shit needs to change