interum commit: DOES NOT WORK
This is buildable, debugable, but not complete.