TODO / finished initial dev