Everything up to point 3

Doesn't crash. Good. Sleep deprived.