Removed lwt, updated interface, much refactoring!