Branch manu

@jensitus: huston, we have now a db layer