Started fixing things