Slight re-org this is totally not userfriendly.