Removed errors in compilation, still untested, still has undefined references