Moving to scope; not working quite as intended at the moment