WIP - support for self, sizeof, a few more more tweaks