added in basic functionality, not hooked to jsons yet
copied from warmup