cleaned up-- base version, come back here

Come back to this version if I get lost on the next work.