code as of wed afternoon. about to debug with wall