basictypes compile now, some stuff was commented out to make it work
follow //TODO and //FIXME markers