More and more functions + refactored frames