a few more tweaks and it builds! :D