First *real* commit with source (still WIP)