Continued functionality commits

Signed-off-by: Brock Overcash <brock.overcash@gmail.com>