Adds markers
Removes test code
Implements userType object