got rid of session and prepared to package