Fully implemented now

+ Changed indentation to spaces