This is a merge from Mako, gonna be taking this back to almost the preview img with libs, bins and apps then working up to bunyy