Works and no longer hacky :)