Initial fikt
A little refactoring