nearly everything done

Signed-off-by: Michael <michael@falsebehavinganimals.com>