Working added more, needs some features yet