committing what I have so far, still working some things out