Still revamping type system.
small change to makefile