wip-Development

working on tests next
instead of managing commit/rollback manually