Attempt 2 to getting working