commit main code 'quick and dirty'