All features placed, now refactoring