Fixes #1 WIP initial setup