wip-Development

working on tests next
thinking about it, likely best to use sqlalchemy's context support