Some data types added, still working on it though