Makefile admin
Class integration