Noted indeed. There's definitelly plenty more that could be done, I just tried to keep it simple to cut on testing time.
