Major functionality should finally now be finished