Close to fully working