Basic architecture work
Added formerly untracked files