big changes, lots of added support, first real commit message