Feature/initial setup

yay merge