ready for testing
Cleaned up some code last wek but forgot to commit...