the forgotten commit of friday night

some major changes made on friday. Committed on monday.