bit broken, but better

Will work on when I get home