Initial commit, hotswapping available methods works