wip-Development

working on tests next
more antipattern