Commiting some code that actually works this time