Refactored some stuff, added Contact