more refactoring, need to think about how door swipes, interlock swipes, manual swipes and any other types of swipes might affect the design