Merged Charlotte's changes Signed-off-by: Hunter Fuller <hfuller@pixilic.com>