Means now working plus a lot of commenting / structure