Frame nearly done / refactoring needed
Refactoring