Commit #2 - Just some more BS
Nothing functional yet. Maybe next time.