Trying to handle #1 and beginning an implementation.