added hour
added some functions to annuli
added some test functions
nothing