Commit first draft of functionality