stuff
Slight changes
better namespace usage