Sideb0ard/refactor