Moving properties into implementation file now