sorted out the scale - still need to refactor a lot