Begin adding data models (still early days), + added some access modifiers that were missing