Starting to make it look less shit