1. Moved to a saner file format ☺
2. First pass at references