committing code, not sure i'm making progress..