Still in progress

Everything I'm doing seems to be breaking the current functionality,
might have to abandon this path and see how melany is doing her stuff.