First proper working commit, albeit only locally