finished basic functionality. need to modify to fit wiki