Ok.. should be the final commit. after much hax finally done zzzz