Feature/setup

This should make development a little smoother