Considerable cleanup to the map class
Updated action such that it starts
Partial cleanup of session