Whatever I modified, it wasn't important
Added utility stubs and makefile modifications