updated for Makefile building. TODO: Update circular dependency fix for get/set methods