Few bugs getting cleaned up
Allowing input to be passed in directly