Ability to flag lots added, broker out marker id from lot id, general refactoring