Some new methods. Working out the kinks.