first working commit, lots of new ideas on the table