Added a few more properties things, still not much done