BETA 1: all functions working, some minor fixes to do