Moved some stuff around
Moved stuff around and added some features for visiting
Added new features