Started to implement new stuff