Getting back in the swing of things... improving the back-end

Signed-off-by: nbuechler <natebuechler@gmail.com>