cleaned up to just basic functionality