commit

still need to implement db and unique id
'fixed'