Initial edits to get baseline code up and running