Working commit
stuff works