(I have more work on this module on my todo list but i want do expedite the trivial issues first)