Fixed rerun boolean checks, fixed cylces, ready to move to server/client interface