adding kibit and taking its advice
starting to separate the lib parts from the app parts