FIX #8 #9 Added logic to prevent issues with annotations and added a test if the controller has already been loaded