Okay, maybe this coffee isn't so bad
Split source into two files