Problem 08 and 09 - Solved. Probably need more testing.