More clean up

Cleaned up more comments
Finished Personal Conditionals

Finished code now will do testing