Dev/initial

cc @Raynos
Both of those will work actually.