Pre-alpha final push - v0.1a