Updated various to working

Code now working and parsing correctly with habitat