Initial commit - cases 13-19
Fixing crap