Neater slightly.. no fucntions yet