Factored out somethings into a new file, added some skeleton code, things compile