More tweaks, starting to have most of the functionality, still a lot to
do though...