Friday Progress Report 280

Bug catching almost playable