Worked a bit more on things