Restructuring
updates, looks to work but chasing dbal errors