Moved and fixed and stuff