Still needs some tweaking/ rearranging..