fixed bug, calling wrong function

eom

Signed-off-by: Robert Tipton <tret@tretflix.com>
Big rewrite of all functions

eom

Signed-off-by: Robert Tipton <tret@tretflix.com>