Fix indent and add basic functionality