Dev/initial

cc @Raynos
Cool. Thanks