Revert "Revert "Initial commit part 2""

This reverts commit 65ac4b69439688df1912bdfd624516fe0f7e9abd.