more main stuff

need to test :P