Added all functionality, time to check vars