A ton of refactoring
Adding actions template