Merge branch 'implement_methods' into develop