Initial code review

Want to take a quick look, @iulukaya ?