Getting rid of bugs
Trying to merge