Overhauled data types; comments now working