Initial commit after hooking up in correct place