Edited refactor
All methods functioning, main method stable