wrote 2 maces
integrated shuais work, mace fixes
added lazy dependency injection