Committing code. Will be debugging this on my machine