[WIP] Finish basic properties