Move some functions around
Try to do stuff in other places